Generate README and INSTALL from configure

diff --git a/Makefile.am b/Makefile.am
index 37bc9ff90e80c420ddc08719f890fa52830f2259..f1f12e6857e84d3e9c17ae821ae667968b8d09df 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,11 +9,13 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 EXTRA_DIST +=                  \
        autogen.sh              \
        HACKING                 \
+       README                  \
+       INSTALL                 \
        NEWS.pre-1-0            \
-       README.commits  \
+       README.commits          \
        README.win32            \
        config.h.win32          \
-       makefile.msc    \
+       makefile.msc            \
        gtk-zip.sh.in           \
        sanitize-la.sh          \
        po/README.translators   \
@@ -88,19 +90,11 @@ ChangeLog:
          echo A git checkout and git-log is required to generate this file >> $@); \
        fi
 
+.PHONY: ChangeLog
+
 uninstall-local:
        rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
 
-dist-hook:
-       if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
-            CONFIG_FILES="INSTALL:$(srcdir)/INSTALL.in README:$(srcdir)/README.in" \
-            CONFIG_HEADERS= \
-            $(SHELL) config.status \
-            && cp INSTALL README $(distdir) ; \
-       fi
-
-.PHONY: ChangeLog
-
 DISTCHECK_CONFIGURE_FLAGS =            \
        --enable-gtk-doc                \
        --disable-doc-cross-references  \

diff --git a/configure.ac b/configure.ac
index 14a0c757453e9bd4155976a2a2b56fbee0bffd7c..1ec49c8fb10c0d5dfa96af89961ba9df421e3cf7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1869,6 +1869,8 @@ fi
 AC_SUBST(GTK_LINK_FLAGS)
 
 AC_CONFIG_FILES([
+README
+INSTALL
 config.h.win32
 gtk-zip.sh
 Makefile